Make sure we include staysPressed in the list of arguments to the Button object

, so that we don't end up ignoring minHeight.

svn path=/trunk/; revision=58

diff --git a/js/ui/button.js b/js/ui/button.js
index 57406056595647c4ca027e06eb02737e0169980c..73f4a09332ba21dcc5287b8a7ecfa9a38d844dbb 100644 (file)
--- a/js/ui/button.js
+++ b/js/ui/button.js
@@ -18,8 +18,8 @@ const PARTIAL_OPACITY = 0.4 * 255;
 
 const FULL_OPACITY = 255;
 
-function Button(text, buttonColor, pressedButtonColor, minWidth, minHeight) {
-    this._init(text, buttonColor, pressedButtonColor, minWidth, minHeight);
+function Button(text, buttonColor, pressedButtonColor, staysPressed, minWidth, minHeight) {
+    this._init(text, buttonColor, pressedButtonColor, staysPressed, minWidth, minHeight);
 }
 
 Button.prototype = {

diff --git a/js/ui/panel.js b/js/ui/panel.js
index 0cd4c80709d0613f7e53cd67f2afad0c14b7676b..a43f3dbe856dea65794645d1cfc5358afccfeaa9 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -34,7 +34,7 @@ Panel.prototype = {
        background.set_position(-1, -1);
        this._group.add_actor(background);
 
-       this.button = new Button.Button("Activities", PANEL_BACKGROUND_COLOR, PRESSED_BUTTON_BACKGROUND_COLOR, true, null, PANEL_HEIGHT);
+       this.button = new Button.Button("Activities", PANEL_BACKGROUND_COLOR, PRESSED_BUTTON_BACKGROUND_COLOR, true, null, PANEL_HEIGHT-1);
 
        this._group.add_actor(this.button.button);